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

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

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