Merge "Keystore 2.0: Rename KeystoreUserManager to KeystoreMaintenance"