Merge "Remove unused userId parameter from RecoverableKeyStoreManager."