Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22

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

Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661