Merge changes from topic "am-68039f13df714ca3824e04b60c1d4d8f" into...

Merge changes from topic "am-68039f13df714ca3824e04b60c1d4d8f" into udc-d1-dev-plus-aosp am: 232e5c64 -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/+/21027121



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