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