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

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

Change-Id: Iafd4a16dc18fae46f900b57a0d8d277d830c30ec