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