DO NOT MERGE: Add option to skip and avoid captive portals. am: 488c84ca1f -s ours am: 8006bd5c66 -s ours
am: c5585a4fec
Change-Id: I7e7f6fa8d643bbd83c9b73614f80d202e3f28f20
This commit is contained in: