Merge "Add mainlineModuleVersion in WifiMetrics" into rvc-dev