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

Change-Id: Ife00aa79179bb3b28d45f652e538e07ed3d23b27