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