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

Change-Id: I78ed7c841680ed3d82835bca2394384311e6d8b1