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

Change-Id: I9b0424c22d1711e111bac200b026f7829bc1de48
tree: 7589d7d5c1e50273ecf6d5a519c98c452ec92e43
  1. core/
  2. services/
  3. tests/