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

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

Change-Id: I6e2f3efde9c8eaa7c0a324f3bf64cd4773df81cf