Merge "Add missing calls to key sync task in LockSettingsService"