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