Merge "LockSettingsService: migrate to its own keystore namespace"