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