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

Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main am: 5db49a35 am: fdcc28eb

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



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