[automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 am: 02adeaa9c1 -s ours am: cf89719edc -s ours am: 3a18486086 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 d8a33be2e3 is in history
Change-Id: I0e3e8d7f856fb4076efbc220127745341890912b
This commit is contained in: