Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev