Merge "Add some debugs to diagnose test failure." am: 87db609348

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

Change-Id: I684168370c0f382af9ac93521cf134c6f5d93d47