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