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

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

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