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

Merge changes from topic "am-b5421922aba842e3a3578d8982fc5eb2" into udc-dev-plus-aosp am: 7b059f45 -s ours

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

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



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