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