Merge changes from topic "microdroid-manager" am: f0dc20962e am: 01c909cdaa

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

Change-Id: I194027cf506c6248f04f3c27b8427019dfca9042