Merge "Credential FRP: keep gatekeeperd credentials after reset"