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

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