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