Merge "add a current table in CarrierIdProvider" am: 3fa6fe2117
am: 9fce67f50f

Change-Id: Ia8dbd47c1c4cf775f7597e7e93c8315bf004e9e0