Merge "[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 am: f0bfba755b -s ours" into rvc-d1-dev-plus-aosp am: 9cb7c955d9 -s ours am: 33efaee6eb -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 cec556227a is in history
Change-Id: I5b6afa12958ae79b7c42ca63cf619ccbd4a0927a
This commit is contained in: