Merge "Add debug logs to CaptivePortalTests" am: fe1a4f6e60 am: 84e05d9e98

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1819792

Change-Id: I2483d08de9393396a2504988273609199d69e67e