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