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