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

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

Change-Id: Icbb3f7dafdce5e174b8d08b769e1289eef2a45c0