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

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

Change-Id: Iae2f72efe4c231ab6233881c4377e8dfdbec4c89