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