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