Merge "Add API for CaptivePortalData" am: 2af00b43b5 am: bfdbb07f60

Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0