[automerger skipped] Merge Android 12L am: 95bbd691 -s ours am: ddef017e -s ours am: 84ff1b21 -s ours am: f94eb89e -s ours

am skip reason: Merged-In Iecbabd04c98737c2732dc72649dfc18ee7c17f6a with SHA-1 0dc01136 is already in history

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

Change-Id: I19b6b1d21b07e539b278a8e9a6a9fcfe34a300de