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