[automerger skipped] Merge UQ1A.231205.015 am: 0fea872397 -s ours am: ae0eeb0209 -s ours

am skip reason: Merged-In I7ec4144b29ed10f1afc2df4fc264628394c7b164 with SHA-1 a5062e12ee is already in history

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

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