[automerger skipped] roll back version am: 24d48cc3cd am: 31b592fd3e -s ours

am skip reason: Merged-In I661b258ffdc3da052b46988dce3f44530ef55699 with SHA-1 c88ca6177d is already in history

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

Change-Id: Ifc9804279a6ab07ce51a4a5c73f0f730adb44171