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

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

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