Reland "Only format /data in recovery if user specified a new fstype"

This reverts commit c89b4e43.

Reason for revert: reland the feature with bug fixed

Bug: 293313353
Test: Enter recovery with data wipe command

Change-Id: I2e1cfb91966c1af0145aac43cf11629cef9380d2