[automerger skipped] Merge "Merge UQ1A.231205.015" into aosp-main-future am:...

[automerger skipped] Merge "Merge UQ1A.231205.015" into aosp-main-future am: 490e264e -s ours am: 15cd320c -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 c793afe3 is already in history

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



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