[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours am: 4618919428 -s ours am: 302b4175eb -s ours am: 48d37076b4 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 ac7fe6c583 is in history
Change-Id: I6b082d8669e77cb0f9859a6238c8084064ad81cf
This commit is contained in: