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