Merge "Remove references to nonplat sepolicy" am: 37919f5b87 am: 012a7d8166 am: 91850c27fb am: 61682bd7da am: a3b021024d

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

Change-Id: I6151804967293ae766fdf74e9485e56eea88731d