Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev
am: 5625d486b9

Change-Id: Iaec556477328fdf5e5f304a456c8942bca11592a