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

Merge changes from topic "am-bd60b3fda9634031a38927aec8b04229" into udc-d1-dev-plus-aosp am: 85075e67 -s ours

am skip reason: Merged-In I3f28027d5e24796ceb01fc1eb164aac8814a1753 with SHA-1 435f835d is already in history

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



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