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