Merge "Support multiple partition for /data" into main am: d38aa9fa0a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3061524

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