Merge "Support vendor partition in non-debuggable pVMs" into main am: 23903e1655 am: d679e60b01

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236797

Change-Id: I4e93017188a196270be64252808d35b2be5aa663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>