[automerger skipped] Merge Android 12 am: a1188f61 -s ours am: a3d96504 -s...

[automerger skipped] Merge Android 12 am: a1188f61 -s ours am: a3d96504 -s ours am: a101152a -s ours am: cd67f62c -s ours

am skip reason: Merged-In I291da39a81666a7bbd001a685d1db12c84e4d31c with SHA-1 5821c67d is already in history

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

Change-Id: I32368e43492807f5dba8e008079561a7850022fc