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

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

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