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

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



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