Merge changes from topic "am-59ee5b457bbd4eaabb6b1dc000b3668c" into...

Merge changes from topic "am-59ee5b457bbd4eaabb6b1dc000b3668c" into udc-d1-dev-plus-aosp am: a88b0da4 -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history

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



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