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