[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6 -s ours am: fa0fb98c2f -s ours

am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa is already in history

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

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