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

Merge changes from topic "am-a660d9f5d99a4811ad3a2d35b16d1b29" into udc-d1-dev-plus-aosp am: 540f80f4 -s ours

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

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



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