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 am: 4fb369aa

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



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