Merge "Revert "[VirtMgr] Allow host-controlled avf/untrusted prop"" into main am: 025ba5dbe7 am: 3cdf795bc4

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

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