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

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

Change-Id: I1e38274a853eb2ef341334f2c563559da14bba3b