Merge "[SafetyCenter] Rename SafetyEvent.SafetyEventType to SafetyEvent.Type and isResolving to willResolve to address API feedback" into tm-dev