[automerger skipped] Merge UQ1A.231205.015 am: 5da189e0 -s ours am: 1e8815c1 -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: I77af41e60b81009e2c734262a3c11df5bd4ebbd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>