[automerger skipped] Merge "Add NTFS support in vold" am: c9579dc1 am:...

[automerger skipped] Merge "Add NTFS support in vold" am: c9579dc1 am: 8271b662 am: da96f04d -s ours

am skip reason: Merged-In If4197c4c588866c611cd6ba3483707d3cb0e0cf8 with SHA-1 28858c9b is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2398952



Change-Id: I6bc170c658d0b61c59238ce370d947916b54387d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>