Add module info AIDL changes and bump the KeyMint version

Bug: 369375199
Test: Manually checked that module info is added to the attestation when
 sent via IKeyMintDevice::setModuleInfo.
Ignore-AOSP-First: Lands with other HAL version bump changes to avoid
 build failure. At least one of the changes is internal. Will
 cherry-pick to AOSP ASAP.
Change-Id: Idb11823e6b65cf17d62ae8687febffee860565e3
diff --git a/gatekeeper/aidl/Android.bp b/gatekeeper/aidl/Android.bp
index 169a7d5..88c10b7 100644
--- a/gatekeeper/aidl/Android.bp
+++ b/gatekeeper/aidl/Android.bp
@@ -10,8 +10,8 @@
 aidl_interface {
     name: "android.hardware.gatekeeper",
     vendor_available: true,
-    imports: [
-        "android.hardware.security.keymint-V3",
+    defaults: [
+        "android.hardware.security.keymint-latest-defaults",
     ],
     srcs: ["android/hardware/gatekeeper/*.aidl"],
     stability: "vintf",
@@ -32,7 +32,7 @@
     versions_with_info: [
         {
             version: "1",
-            imports: ["android.hardware.security.keymint-V3"],
+            imports: ["android.hardware.security.keymint-V4"],
         },
     ],
     frozen: true,