[automerger skipped] Merge Android 12 am: 651eb56a47 -s ours am: 01cc12906f -s ours am: c1b8a1872a -s ours

am skip reason: Merged-In Ic183580a33103f94f95e6b50f3f6b2db3d9fd0e9 with SHA-1 da0f7ba8f4 is already in history

Original change: https://android-review.googlesource.com/c/device/google/crosshatch-sepolicy/+/1847417

Change-Id: I429fc56ad989b6baa87448dd2c148a84d31551b9