Merge "Split mac_permissions.xml into plat and non-plat components." am: a1c9c860a9 am: 455202b9db
am: 33d3d19235

Change-Id: I4c60853dc695943d1c9374ab5e1cc8af995de154