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