Merge "Move CaptivePortalDataTest to common test to support cts"