[automerger skipped] Merge "Merge TQ2A.230405.003" am: 37b78cc90b am: 468fb022a5 -s ours

am skip reason: Merged-In Iddb8619be7bdd9767211e44913e8ba3871bc6580 with SHA-1 ceac41ebda is already in history

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

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