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