Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 5aa1e896d0

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

Change-Id: Ice09ada3cee58f72c8b340483438a883562e05f1