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