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