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: I8d120a6594b84096218668d64b5e502acd44711f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>