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

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



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