Merge "Add odm sepolicy support to SELinuxMMAC.java" am: 4db2d4690e am: 665737f124
am: 8ea2130cbd

Change-Id: Ib4322166ad2e0eccf3bdaed78b8e94523081a1e7