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