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

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

Change-Id: Iea32091dc37df1f9669e8035f5a20fb64cb70795
tree: dff7ff3224ae974dd005519bb2c4e708572b6c38
  1. tests/