Merge changes from topic "am-5d8334fe3bef4d979c7c8e0ac715457e" into...

Merge changes from topic "am-5d8334fe3bef4d979c7c8e0ac715457e" into udc-d1-dev-plus-aosp am: 3bd7af35 -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/+/24605806



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