Merge cherrypicks of ['googleplex-android-review.googlesource.com/39862155'] into 26Q2-release.

Change-Id: I5e8b6f6f29c038ff5444e538545945b90489cc7e

security/keymint/aidl/default/Android.bp

diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp
index f1743fd..30b4987 100644
--- a/security/keymint/aidl/default/Android.bp
+++ b/security/keymint/aidl/default/Android.bp
@@ -32,6 +32,10 @@
 // A real device is required to run the TA code in a secure environment, as
 // per CDD 9.11 [C-1-1]: "MUST back up the keystore implementation with an
 // isolated execution environment."
+//
+// This C++ reference implementation will not be updated to support versions
+// of the KeyMint HAL beyond version 4. Use the Rust reference implementation
+// for versions 5 and later.
 cc_binary {
     name: "android.hardware.security.keymint-service",
     relative_install_path: "hw",
@@ -62,7 +66,7 @@
         "service.cpp",
     ],
     required: [
-        "android.hardware.hardware_keystore.xml",
+        "android.hardware.hardware_keystore_V4.xml",
     ],
     vintf_fragment_modules: [
         "android.hardware.security.keymint-service.xml",