[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev...
[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b -s ours am: 2b41cbf5 -s ours am: 12b29d1a -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 55bde27f is in history
Change-Id: I4156d861f9621213a93d7bdbe0ecad7b2b805bae