DO NOT MERGE Reworked additional permissions fragment for each app am: 6dfb1f6553 am: 18817ebb89
am: d49c29ae9a

Change-Id: I6507b6707dccaaa2c8cad30d9b1b044ca426c02c