Merge "Get the correct fstab entry if there are more than one" into main am: 41d3e8d1e5

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

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