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

Change-Id: I041cd82448479a2d1f67d1cc5ef854272348591f