Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17449225 Change-Id: I2af5fea0a6720a6221cd4a2e80c41aa509b23ff1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>