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