Merge "Move TestApfFilter and MockIpClientCallback to ApfTestUtils" into main am: 6c89efa02d

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

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