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