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