[automerger skipped] Merge UQ1A.231205.015 am: 7f9f6cac0b -s ours am: 0fa2dbcfc4 -s ours

am skip reason: Merged-In I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe with SHA-1 1bc693d338 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/25591050

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