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

Change-Id: I51664c07a3fc23cc26c9b66f449ce63a2954a11e