Merge changes from topic "am-3b28810eb2844ec6a5fe91fd42c8bc47" into...

Merge changes from topic "am-3b28810eb2844ec6a5fe91fd42c8bc47" into udc-d1-dev-plus-aosp am: e1fee437 -s ours

am skip reason: Merged-In Iffe5625ae57c21874805ef98b67faac9f56f87f5 with SHA-1 8bddf509 is already in history

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



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