Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp