[automerger skipped] Merge changes from topic "udc_qpr2_merge" into...

[automerger skipped] Merge changes from topic "udc_qpr2_merge" into aosp-main-future am: 9871f1a6 -s ours

am skip reason: Merged-In I1abc779ddc4fd79644d64b704698d0e7d67a9d75 with SHA-1 e5c85f77 is already in history

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



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