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