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