Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: I97998b225edceb2f17203f56f40688c69ceb6934
Change-Id: I5a2f16da0e8c24f928236b4c29cfa508cee6cd3f
diff --git a/vintfdata/freeze.sh b/vintfdata/freeze.sh
index a624ee3..d14f36e 100755
--- a/vintfdata/freeze.sh
+++ b/vintfdata/freeze.sh
@@ -19,7 +19,7 @@
     return 1
   }
 
-  local modules_to_build=check-vintf-all
+  local modules_to_build="check-vintf-all vintffm"
   echo "Building ${modules_to_build}"
   "${ANDROID_BUILD_TOP}/build/soong/soong_ui.bash" --build-mode --all-modules --dir="$(pwd)" ${modules_to_build} || {
     echo "${modules_to_build} failed. Backwards compatibility might be broken."