Merge "Move captive portal detection to another thread"
am: 9514b362cd

Change-Id: Ibd8ebcae32c906717ffbf52bf874556db86cc792