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