Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev...
Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 74482874 am: bf950c65 am: 580dcdbf
Change-Id: I8705c33f9d4724008bf5c8e8d6e2262160521f4b