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