Merge "Move CaptivePortalDataTest to common test to support cts" am: 164eea2a4f

Change-Id: If5a2f476285d3e276d6fdbb695514489de18cb50
tree: e7f3d70879d4fbe3ea4ada0721791bab60cb9432
  1. core/
  2. services/
  3. tests/