[automerger skipped] Merge "Add some debugs to diagnose test failure." am: 87db609348 am: 41eed1ede2 am: c1f3bb29ce -s ours

am skip reason: Merged-In I096258d8c55cf56478015a655b5f3be19f29ace1 with SHA-1 dd4f44f475 is already in history

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

Change-Id: Ia886455a05f130cfd4d6b4e3b275cc6f4202d6d7