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

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



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