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