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