Merge upstream sepolicy into AOSP

Change-Id: If3ed9998033378de5b47472315444f5b8bd4743e