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

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

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