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

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

Change-Id: I0aaa83feb4937d6b7dfa016cfd62b0fa8f51c8e7