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