Merge "CarrierIdProvider improvements"
am: 864d22ac5d

Change-Id: I6d0d113ca89baaa627dc65cbc5351e495b727faa