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