Merge changes from topic "am-de52e7c0a3e74a1493bd0477e0125080" into...

Merge changes from topic "am-de52e7c0a3e74a1493bd0477e0125080" into udc-d1-dev-plus-aosp am: 4b213680 -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/+/21027271



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