Merge changes from topic "am-61de424e00fa4c039dfc661b35221ab1" into...

Merge changes from topic "am-61de424e00fa4c039dfc661b35221ab1" into udc-d1-dev-plus-aosp am: 11787f9a -s ours

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

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



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