[automerger skipped] Merge "[vold] Check incremental paths before mounting"...

[automerger skipped] Merge "[vold] Check incremental paths before mounting" am: 537b76cd am: 98fc4845 am: 718d74d6 -s ours am: 756d3f3b -s ours

am skip reason: Merged-In I6035447f94ef44c4ae3294c3ae47de2d7210683a with SHA-1 40389820 is already in history

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

Change-Id: I8fb4500ff02312f9dc54eb66c662728891874aea