Merge changes from topic "am-6fc7342924244409af40625086a7ba59" into...

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