Merge "sepolicy: testValidSeappContexts is failing in CtsSecurityHostTestCases           android.security.cts.SELinuxHostTest on AOSP swapped device"