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

Change-Id: If1e5f0f82e18608990500d41211a49e9acbef51f