Merge "Split out more privapp permissions" am: 7e620669cf am: 530a86ef3a
am: 2dd31acf42

Change-Id: I5a18b51e5f66f9782e77dbee7b57716bb9b48b14