[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 am: bf950c65 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 f4ebfd4b is in history
Change-Id: I456b3a54dc8a870a7093e08fb36de7c221b062e4