Merge "Add NetworkNsdReportedMetrics" into main