Merge "Add odm sepolicy support to SELinuxMMAC.java" am: a0c52a8ace
am: 5f2f65239b

Change-Id: Ib09918bd84ae40701b30aebe31ef71ffeecdea7e