Merge "Revert "Set ro.fstype.data when /data is mounted"" into main am: 58a38f4681

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3107408

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