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

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

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