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

Change-Id: I2a314f827db34cc92058729629d9000526b43027