Merge "Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java"" am: 0e844063 am: 6c7981eb am: 383668ca"