Merge "[Passpoint] Metrics for S release" into sc-dev