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

Change-Id: I3226ebb28d001cd31983622a5c8c3a080cca3026