Merge "Add API for CaptivePortalData"
am: 2af00b43b5

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a