Merge "Prevent reset of EmergencyCallDiagnosticLogger active call timestamp" into main