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

am skip reason: Merged-In I87fd24ba084691c238f5c07272208049acaf2e5d with SHA-1 45e117b890 is already in history

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

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