[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-38eb37bb57e04c4d9a78baa4867e10b9" into udc-dev-plus-aosp am: ac96599d -s ours am: a4f73d4c -s ours

am skip reason: Merged-In I0fd447ddbf810090e19305b2dc8278acd6e0887d with SHA-1 c187a5cd is already in history

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



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