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

Change-Id: I05cd7a3c8b7a64a9085a5321d296dc00677149d6