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

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

Change-Id: I106b65532268b78a378b7d280578426c79c21110