[automerger skipped] Merge Android 12 am: 49b11dbe -s ours am: 05150318 -s...

[automerger skipped] Merge Android 12 am: 49b11dbe -s ours am: 05150318 -s ours am: 7586eca2 -s ours am: 8a5e817d -s ours am: a6136ce8 -s ours

am skip reason: Merged-In Ifb2e882bb5ae77f7b22d299d8f8f9985c87ad147 with SHA-1 dd3e41c1 is already in history

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

Change-Id: Id15badcc583d3572e92638d013b05fb9a74e28b2