Merge "Add more tests for CaptivePortalData" am: 4ae6e556c1

Change-Id: I68aaf60a82227d647dbf3394ae6ec87627426a7e
tree: 8370b3f7b930764c1ec83f2cc2b83223c6c0d030
  1. core/
  2. services/
  3. tests/