Merge "Revert "Use resource instead of carrier config"" into pi-dev
am: 068670def0

Change-Id: Ib81684700363d04d2e1732876d8f01461bc1ad04