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

Merge changes from topic "am-b823403b79fe4724986fa1e17f68f64e" into udc-d1-dev-plus-aosp am: 92c4877c -s ours

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

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



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