Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1 am: aec3a5e548

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

Change-Id: I34a18a9becc0b932c6a7df9546de195e85c2076e