Merge changes from topic "am-9094483288d943e1b012a32040f6978f" into...

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