Merge "Remove references to nonplat sepolicy" am: 37919f5b87 am: 012a7d8166

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

Change-Id: I60ffcc91c332f77431199a10fc774303c072fcd7