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

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

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