DO NOT MERGE: Add option to skip and avoid captive portals.
am: 1f64f3fd14  -s ours

Change-Id: I549bc49715a6476069f30aa206d8b4d1310fe6c5