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

am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 52e3fa127a is already in history

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

Change-Id: Iec4ae32af71c8cbed57697733c88e0d7e202dba4