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

Change-Id: I951f2eb2a0e2550f65ac87a84b76ea68c2449423