Merge "add a current table in CarrierIdProvider" am: 3fa6fe2117 am: 9fce67f50f
am: ddf41d99f3  -s ours

Change-Id: I6ab44a03d398b0a55003cd83334050af904ce2eb