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

Change-Id: I8276dbfa5e11df4d7f97102d8717e8218c182657