Merge "[vold] Check incremental paths before mounting" am: 537b76cd98 am: 98fc484581

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

Change-Id: I656c80873cbae20a1d85e3e66c9793202b1a1197