Merge changes from topic "am-5a11a677afb042cfb9023494b6cb12b3" into udc-dev am: b69e680e -s ours

am skip reason: Merged-In Icab100bd4ae9b1c8245e6f891ad22101bda5eea5 with SHA-1 557941ca is already in history

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



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