Merge "Revert "Support vendor partition in non-debuggable pVMs"" into main