Merge "Add API for CaptivePortalData"
am: 1c42b174ed

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