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