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

am skip reason: Merged-In I788344419e2eee44443f4e4cc342c0de11632be1 with SHA-1 6a19b91e9d is already in history

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

Change-Id: I04a5505fdec1d08c78a548a9827978cda4cf803d