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

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

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