Merge "Refactor ApfTest to use more Mockito mocking" into main am: ae7610da57 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/3157997 Change-Id: Ia4b65a9491aa35cae61c9bae7798b7db8bbb39a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>