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

Change-Id: I1f31dc2fcf01adf7c55a4b31c2776e88d799cec4