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