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