expose carrier id APIs and cleanup

Bug: 110559381
Test: unit test
Change-Id: I151bc3096251f7ddd803c03c82d576ca8a93a108
2 files changed