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

Change-Id: Ieef24e0184bb7623610164e9bd228846ec86452f