Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I977fa738050ae90d6f0cf7d0bb5d1f5a006ab696
Change-Id: If39bf65998fe85a3da4572cbfcf359a169f4de65
diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
index f633834..50a3f3f 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -22,4 +22,5 @@
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
index 0b23ed5..208ee17 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -22,4 +22,5 @@
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true