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