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

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

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