Merge "Add aosp patch to fix filesystem check fail when mounting." am: b1b772592b am: 2225448c26 am: b1d300f45a

Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727

Change-Id: I6f48585b8aa45eb5b3c1a2cec38c366c2b72b88e