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