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