Merge "expose carrier id APIs and cleanup"
am: 7386c65b1d

Change-Id: I677bcccfc8c0526bbe32b5968c12dcac052bd61f