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