Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 am: 56e5978547

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

Change-Id: I6817ee46e6dc6ba84dd7fbfc89bccf82819e4eec