Merge "Remove reference to nonplat sepolicy" am: d62f9054e8 am: b49a354cfd am: a76638e402

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930822

Change-Id: Ibf60a0dd408a2b285e4643e7f7fe173fe7db34e9