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