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