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

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

Change-Id: Ia401e9e9ec062311d477b7df2b5a714534629367