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

Change-Id: I26c54a68134f145d709241e6361041660c7f63a9