Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: f7c0f602d3

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

Change-Id: I84c217b28a73f8ee3d941cc1802f1d2371f4ec2e