Merge "Use non-extended mockito for net-tests-utils" into main am: ec2a5cc5c5

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

Change-Id: I21c684067253b86c3e36e7863b5cbdfc25e138d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>