[automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a am: 00b03beb31 -s ours

am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

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

Change-Id: I8f8c94bc99b5f25cc26f7558c2ed2aac173461cd