Merge "[automerger skipped] Restore historical behavior with fsck_msdos (always accept fixes). am: 3601f4790b
am: cd5df6e1ef
-s ours am skip reason: change_id I1d50a7e52fda34e59eb6f051c7fde115a6cd5255 with SHA1 3d3a9a7f1c
is in history" into qt-r1-dev-plus-aosp
commit
e7cd361716