Merge "Add util APIs for Passpoint WW metrics" into udc-mainline-prod