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

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

Change-Id: I36e31d9adde811abd502cf9285a769a1240522e5