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

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

Change-Id: Ie5b04c5ea05d330dcc97d098720b08d4797927de