Merge "Remove nonplat_sepolicy.cil from test" am: 3e1c3f7324

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1918578

Change-Id: I172df62634fc43aaaa85087a8b6d89278eee8121