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

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

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