[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 4218d8df3a -s ours am: 01880bf246 -s ours

am skip reason: Merged-In I4c853eb73f2381e63aa75444bcca0ee80a8da4f1 with SHA-1 ffef67df3c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mtools/+/16843766

Change-Id: Ic3282684793f6736d6f321268f2788e80e734113