Merge "Remove permission for APEX manifest." am: c3b3fdf8d6
am: dab41761f5

Change-Id: I2bf91224be7dc5c7bc912325e3624a5b47d5e88c