Merge "WifiMetrics: separate count of passpoint profile type for R1 and R2" into qt-dev