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

Merge changes from topic "am-b6b10a616325427088a920b673bff57e" into udc-d1-dev-plus-aosp am: 70050ac5 -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/+/24300600



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