Merge "Add API for CaptivePortalData" am: 144519f45d am: f3011f77d1

Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0