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

Change-Id: If5c56ad5ee02acf5964d31eb2445e3cd52249dc5
tree: 2b0c572d8c2e072a093acf33636b0b6824f7280e
  1. core/
  2. services/
  3. tests/