Merge changes from topic "microdroid_launcher" am: 24abe6ae4b am: 3784b8f00d

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

Change-Id: I56c0e48bc2e0e2706010c4f5e72db6abb3a9890d