Merge upstream sepolicy into AOSP

Change-Id: Ia292607cbd06514a8ac3b0ad49eaefcdce12ef16