Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev am: 683dbf1fc6
am: b4aa5f6e13  -s ours

Change-Id: I613932ff02241d062008aa943cd8db5f098c78ff