Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert^2 "Remove references to keymint1"

34536a352803a08776cc4f373d93a94e1fcbf98e

Bug: 175345910
Bug: 171429297
Change-Id: Ib500ff822958804b4aa031c114b7520fa70cd84d
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 4e819b8..e63a469 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -19,7 +19,7 @@
 
     rustlibs: [
         "android.system.keystore2-rust",
-        "android.hardware.keymint-rust",
+        "android.hardware.security.keymint-rust",
         "libanyhow",
         "libbinder_rs",
         "libkeystore2_selinux",
@@ -41,7 +41,7 @@
     test_config: "AndroidTest.xml",
     rustlibs: [
         "android.system.keystore2-rust",
-        "android.hardware.keymint-rust",
+        "android.hardware.security.keymint-rust",
         "libandroid_logger",
         "libanyhow",
         "libbinder_rs",