[automerger skipped] Merge UQ1A.231205.015 am: fb14bb624a -s ours am: 0686c05e18 -s ours

am skip reason: Merged-In Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 with SHA-1 acd9c7a658 is already in history

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

Change-Id: I1e06546c074acb52ec0d3225c631f37145bd6286
Signed-off-by: Automerger Merge Worker <[email protected]>