Merge "Display "Sign into network" in settings when on a captive portal." into...
Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev am: 5625d486
am: bf214587
Change-Id: I69e09d5e0b3e749ef069f7dff4c778209ee483de