Merge "[VirtMgr] Allow host-controlled avf/untrusted prop" into main am: 5929401691 am: 3a2f3e99d1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2950433

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