Merge "Move CaptivePortalDataTest to common test to support cts" am:...
Merge "Move CaptivePortalDataTest to common test to support cts" am: fcdea07d am: 39d7170c am: 725a309f am: aa9f6ee8 am: c49986df
Change-Id: I4d4daaa3f83aed11252e8da721555657a5dfbaa1