Merge changes from topic "virt_vsock_test" am: 523ddfe604 am: 88ae28442a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3022e4f147689af37c157abfa268293a5d4a5e10