DO NOT MERGE: Add option to skip and avoid captive portals. am: a3cbcca3cc -s ours am: 8006bd5c66 -s ours am: ad526b446c
am: 450a3cd69b -s ours
Change-Id: I6af06157789b0eed11588d697e42776cdaafdb11
This commit is contained in: