Merge "Revert "Use resource instead of carrier config""
am: e3021c3971

Change-Id: I95890f73884adc758411ee9f319c9914971ab299