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

Change-Id: I3033faed5edf11c2e918c23028031132dc24cff0