[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: b0518ff723 -s ours am: 031cbe2694 -s ours am: ea8cc2b124 -s ours

am skip reason: Merged-In I967be9bc538bab1ba7d47316befef092cf0f71a3 with SHA-1 7522cecc84 is already in history

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

Change-Id: I3e432767b41dad438c83f8800aef971b2bb0d5ee