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