[automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours am: 71e2367ade -s ours am: 09995066c7 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 be79897cb5 is in history
Change-Id: Iea7c787e40317fd68f98dbf211a95bced64bdb7f
This commit is contained in: