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