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

Change-Id: I5e734d3b55332e5d9bb5bc27515625456edb5df5