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