Merge changes from topic "apf_metrics_test" into main am: 50051f3ffb am: ca290f9c87

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

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