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

Merge changes from topic "am-ef329a45b92049fc944a24d006702103" into udc-d1-dev-plus-aosp am: 13d1d0b6 -s ours

am skip reason: Merged-In Ic466fc22a5be9047d39194ad42c56dc4a2acb4dc with SHA-1 49886792 is already in history

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



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