Merge changes from topic "apf_metrics_test" into main am: 50051f3ffb am: c4b8afc0ea am: 7076c210cb

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

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