Merge "SELinuxMMAC.java: update OWNERS" am: d90decc286
am: bd2b3f9a6c

Change-Id: If3a1bb9d97a29b4c37b80a199ecde8c6c1f4faed