[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 6a7a1caaa4 -s ours

am skip reason: Merged-In I6c11580d5ff6b4a9504047eeb95e722f94be3906 with SHA-1 9731301c77 is already in history

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

Change-Id: I5709ff11313b98ac8156a475cae32afcf65bb6c5