Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
am: f6d8e1f635

Change-Id: I1412b56245583d65f382613fd466ede1efaa298f