[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: dd3e41c1 -s ours am: afe6e4c2 -s ours

am skip reason: Merged-In Ic7e4aa7a825447bba9738343463d1450aac2c00f with SHA-1 87d77860 is already in history

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

Change-Id: I0c9d35bca9c85d055daa82a19691ec2e541cac84