Merge "Revert "Only format /data in recovery if user specified a new fstype""...

Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main am: f554b33b am: b1d235a1

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2905428



Change-Id: Ib1e564e7e4f9f1bac59df26f3f39ed6c5c51116c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>