Merge "whitelist pri permission for carrierconfig app"
am: 4eba7c3cfc

Change-Id: I254d75fbf1317139bbe2fc72633768be069acd2b