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

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

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