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