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