Add option to skip and avoid captive portals. am: 4bc78eba6f
am: 4a048f9964

Change-Id: I530ccb95aa97100b27d71186173645031082acc1