[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours am: 2b41cbf5ed -s ours am: 12b29d1a0f -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 55bde27f29 is in history
Change-Id: I4156d861f9621213a93d7bdbe0ecad7b2b805bae
This commit is contained in: