Merge "Fix vfat retry fsck logic" into main am: ad609263e8

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

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