Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main am: 276eabe757

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

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