[automerger skipped] Merge "Revert "Use resource instead of carrier config"" am: e3021c3971
am: bb39d905c4  -s ours

Change-Id: Ice56e366f57a59c2b0dad6fb2bb757b4f11c10ed