[automerger skipped] Merge Android 12 QPR1 am: ab05e3b7 -s ours am:...

[automerger skipped] Merge Android 12 QPR1 am: ab05e3b7 -s ours am: 2e4ea90e -s ours am: 38bb60c5 -s ours

am skip reason: Merged-In I57cf9a80e074b8b9603d38396d111b372fae9737 with SHA-1 dd141c62 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1921805

Change-Id: Ibfde79c51da975810b1650865881a74d66201862