Merge "Remove reference to nonplat sepolicy" am: d62f9054e8

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

Change-Id: Ib383e0dc0fb6d41bb67350d76ecae4fe45ddbce7