[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: d02b56128a -s ours am: de3e1cc957 -s ours

am skip reason: Merged-In I51805b647462ab980a099ad630007569cef8966c with SHA-1 0209dce05a is already in history

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

Change-Id: Ia76642c169e6989e3a5b0830ef8c55a2c05eff6e