[automerger skipped] Merge Android 12 QPR1 am: ca4ec87e4a -s ours am: 285207c769 -s ours am: fa9ffc7aa0 -s ours

am skip reason: Merged-In I4517f8cd3491de8bbc11cc57512220bc9a18b3c5 with SHA-1 d02b56128a is already in history

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

Change-Id: I1edd73124837a2da441ce766aa2c8457fdec8888