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