Merge "Add API for CaptivePortalData" am: 1c42b174ed am: 12ad1433c1

Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0
tree: 78d9536c7efbd0cbf9a2e9529777339d57977d97
  1. core/
  2. services/
  3. tests/