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

Merge changes from topic "am-a1052cc3f330488d8363a161f069d340" into udc-dev-plus-aosp am: ce5aaff2 -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/+/21027348



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