Merge "Fix some special usb can't mount issue." into main am: 77f8b00c3d

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

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