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