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