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