[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 am: 1a5f9b0a am: aaa1e319 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 9400126e is in history
Change-Id: Ie921cb73a1ea5cf2eb3c758877ef2ba0bc679e06