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

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

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