Merge "Metrics: number of 6Ghz PSC channels" into sc-dev