[automerger skipped] Merge Android 12 QPR1 am: 07e06ee695 -s ours am: fd61865594 -s ours

am skip reason: Merged-In I5646901310b1463cd52da34fcecfcd756a18452e with SHA-1 84d093c690 is already in history

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

Change-Id: I10bb5d59ddb3d0fd689aa4fe08ea0fea008a9594