Merge "Add a test for getCaptivePortalServerUrl" am: ddb629663b am: 68cf03184a

Original change: https://android-review.googlesource.com/c/platform/cts/+/1431431

Change-Id: I1cbbbce5b7283dd0b4089f0ba24b1dabe9e9f544
tree: 9aeac9619c921bbe950054e7e55fba75a0316a1d
  1. tests/