Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa

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

Change-Id: I0b5b976cf9de9beb0db7eca9205196a5afd3eab6