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

Change-Id: Ic188d4136d408214fd3f537c961183bbdd32bede