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

Merge changes from topic "am-d3ce19a218cf418a867e355b3f55fa13" into udc-d1-dev-plus-aosp am: bb66470a -s ours

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

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



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