Merge "fix fstab and booting issues" into android-11

BoardConfig.mk

@@ -87,10 +87,6 @@ BOARD_SUPPRESS_SECURE_ERASE := true
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_VENDOR := vendor
 
-# System props
-
-BOARD_USES_RECOVERY_AS_BOOT := true
-
 # Metadata
 BOARD_USES_METADATA_PARTITION := true
 

recovery/root/system/etc/recovery.fstab

@@ -1,5 +1,6 @@
-/dev/block/platform/bootdevice/by-name/system /system ext4 ro wait,slotselect,avb=vbmeta,first_stage_mount
+/dev/block/platform/bootdevice/by-name/system /system ext4 ro wait,slotselect,avb=vbmeta,first_stage_mount,wipeingui,logical,backup=1
 
-/dev/block/platform/bootdevice/by-name/vendor /vendor ext4 ro wait,slotselect,avb,first_stage_mount
+/dev/block/platform/bootdevice/by-name/vendor /vendor ext4 ro wait,slotselect,avb,first_stage_mount,wipeingui,backup=1,flashimg=1
 
 /dev/block/platform/bootdevice/by-name/vbmeta /vbmeta emmc defaults defaults
+