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