Merge "[automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b am: bfec27ae -s ours" into rvc-d1-dev-plus-aosp am: 494c71ec -s ours

am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 9400126e is in history

Change-Id: Ie076c44aeebb3c2946828069b633a437cb9f036a