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