Merge "Specify which callback is unexpected in tests" am: 5251171b75 am: 12a042be77

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

Change-Id: I48948a8f04a2053cd24f153e1322df00fcedbf64