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