Merge "new CarrierIdProvider for carrier resolution" am: 86a800ae43
am: ffe7643ec6

Change-Id: I62c507676cfc5199315b3168946ec51ef611a074