Merge "Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java"" am: 0e8440632a am: 6c7981ebf2 am: 383668cab4"