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