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

Merge changes from topic "am-ad7da298f87a4048ba11ff3d9dcdc84e" into udc-d1-dev-plus-aosp am: 8ad7f434 -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 efc2b69c is already in history

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



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