Merge "metadata partion could be f2fs or ext4 regardless of vendor api level" into main am: 6088e3dc07

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/2919405

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