Merge "Merge changes from topic "apf_metrics_test" into main am: 50051f3ffb am: ca290f9c87" into udc-qpr-dev-plus-aosp am: f4bd7e6b1c

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

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