[automerger skipped] Merge "[vold] Check incremental paths before mounting" am: 537b76cd98 am: 98fc484581 am: 718d74d66d -s ours

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

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

Change-Id: I40f1b579fdf117f062dbd34f7edb02caea186a90