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

Change-Id: Iab50b51ce33b6ef8c3e1e902c411b85c849c4b29