Merge "expose carrier id APIs and clean up" am: a118a4a772
am: f624391a28

Change-Id: I9333b116771096d1551c08a002a1d79b517edb61