[automerger skipped] Merge "Move CaptivePortalDataTest to common test to...
[automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 74482874 -s ours am: c2f81944 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 06799977 is in history
Change-Id: Icb370b6156503696acf58158597e658c6bd8e6d3