Merge "LockSettingsService: clear strong auth when adding primary credential." into main