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

Change-Id: Iebaf121689e4988e1e1ba2cc5467b09738f96918