Merge changes from topic "am-24796317a7b64464aafa3658caad4984" into...

Merge changes from topic "am-24796317a7b64464aafa3658caad4984" into udc-d1-dev-plus-aosp am: 353d9086 -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: I09f9122696f72124231152de44674f05d97c3ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>