[automerger skipped] Make tests compatible with mockito-extended am: ad8f23fef4 am: ce711c422e -s ours

am skip reason: Merged-In I61fa371e8957037075a2617a014647ff062207c6 with SHA-1 ad8f23fef4 is already in history

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

Change-Id: I93f636e203ba898fcc771eeebe451aca8c6edf33