Merge "Use resource instead of carrier config" into pi-dev
am: 2dca741241

Change-Id: I1e0470b3c38e8b334c36a6e766d1e4498b515b32