Merge "Add more tests for CaptivePortalData" am: 0bb146e4 am: 0cae3ac0 am: fa56a9c1 am: 13bef303 Change-Id: Iebaf121689e4988e1e1ba2cc5467b09738f96918