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