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