Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62

Change-Id: I68bf2166d3fafbcab03ec17ea5f134209798e242
tree: 0edc713294ad1370196378534f56cd5457ccf457
  1. core/
  2. services/
  3. tests/