Merge "Set ro.fstype.data when /data is mounted" into main am: ac7923211e

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

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