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

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

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