[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 d4a9e976e8 is in history
Change-Id: I9d9249b4ae1e31f35a8774f7d145c8afe5ce3145
This commit is contained in: