Merge changes I67b68a6a,Id19bc319 into main

* changes:
  Add VTS test to check grants are deleted upon grantee user ID uninstall.
  Delete grants to a user ID when it is removed.
diff --git a/keystore2/test_utils/attestation/Android.bp b/keystore2/test_utils/attestation/Android.bp
index dbf02d0..0ac5630 100644
--- a/keystore2/test_utils/attestation/Android.bp
+++ b/keystore2/test_utils/attestation/Android.bp
@@ -40,6 +40,7 @@
 rust_library {
     name: "libkeystore_attestation",
     defaults: ["libkeystore_attestation_defaults"],
+    vendor_available: true,
 }
 
 rust_test {