Merge changes from topic "apf_metrics" into main am: 02e4c147b0

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

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