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

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

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