Merge "New Settings symbols for captive portal detection" into nyc-mr1-dev am: 3fc76c4669
am: a68d58a225

Change-Id: I600c11ebf5a96306659e6e7d66d3833a63c40fc5