Merge changes from topic "am-5f6c0eda64b74e83870ecb800fe03f1a" into...

Merge changes from topic "am-5f6c0eda64b74e83870ecb800fe03f1a" into udc-d1-dev-plus-aosp am: a25be2ce -s ours

am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 a67982c9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027348



Change-Id: I5dc319dcc54ea0d0f359850e523a36ea1efbec05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>