[automerger skipped] Merge Android 12 QPR1 am: 6132be309b -s ours

am skip reason: Merged-In I09d5e0ae043b421216856e23644beca76ce54d44 with SHA-1 b169777345 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1921888

Change-Id: I84a0631305780373e1e81a85ce32d6e4a096c8ad