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