Merge "Add Passpoint metrics to connect events" into udc-mainline-prod