Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: 642e48e527
am: fbb870c94e  -s ours

Change-Id: I598948bc8f424760e0dc95f9829ae4a4a10cc401