Merge "new carrier id API" am: 23a5549149 am: dfe1287d83
am: cb5ff8d616  -s ours

Change-Id: I54ce0ccfe9657f11ea7ef2693f156754975783fc