[automerger skipped] Merge "[vold] Check incremental paths before mounting" into sc-v2-dev am: e0f8956247 am: b648eb229e -s ours

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

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

Change-Id: Iff67751afa7915c523c308974e43f7cb295a73ac