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

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