Update to upstream 6424881cc82a65a833fc6fb79730474caedf6222. am: 8c4b3f0afd am: 4bd115afd2

Original change: https://android-review.googlesource.com/c/platform/external/newfs_msdos/+/1555547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f4c23cd3a35217fab5334fc32994622e43db66b