[automerger skipped] Merge "Make com.android.sepolicy mandatory" am:...

[automerger skipped] Merge "Make com.android.sepolicy mandatory" am: 7297032a am: 316b3b71 am: 50c9214e am: ce1c1509 -s ours

am skip reason: Merged-In I23599517b427363e758e6f06763079cc1482cb47 with SHA-1 2e272df5 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I844ac5389430bf2939ca4b269cd6bba9d6b9f7c0