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

Change-Id: I29295e346df79fec7324dd542ff3a4638c172978