expose carrier id APIs and clean up

Bug: 110559381
Test: unit test
Change-Id: I7d3004342ff2f9e13474e29b74fff4533e1d1585
Merged-in: I7d3004342ff2f9e13474e29b74fff4533e1d1585
2 files changed