Merge "Treat APFv3 as APFv4 with not fully working counters." into main am: 0f6a857cf5 am: d1a506817c

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

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