Merge "Add debug logs to CaptivePortalTests" am: fe1a4f6e60 am: 84e05d9e98 am: 35e31a07f5 am: 9ad67912dd

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

Change-Id: Ie7565bda5ac438fd460c00f30bc9e301939e7828