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

Merge "Only format /data in recovery if user specified a new fstype" into main am: d0867b54 am: f4c94f69 am: fd103cf5

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



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