Merge changes from topic "am-c970b13b8bc24d6ca3de8d829c260c12" into...

Merge changes from topic "am-c970b13b8bc24d6ca3de8d829c260c12" into udc-d1-dev-plus-aosp am: dd5fdd87 -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/+/24608564



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