Merge "Add more tests for CaptivePortalData" am: 0bb146e48c am: 0cae3ac020 am: fa56a9c14d am: 13bef3035d am: e8431af6e6

Change-Id: I5ff3a688b8219380a2c0d9cb1a8dccab34fe1cf8