Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance"