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