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