Merge changes from topic "microdroid_launcher" am: 24abe6ae4b

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

Change-Id: Ie6f55dcdfddfc801ba5aed2c41b352aba88ef849