[automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 am: a82d1a814a -s ours am: 10e5682594 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 210a4da6ed is in history
Change-Id: Ic97ef61a0430d2b74a84f0667599d9030db8e727
This commit is contained in: