Merge changes from topics "b/200924402", "composd_race" am: 16a2b5b7ce

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

Change-Id: Ibd44735b3dae8bdc7119c256162c02a5a2f8f99c