Merge changes from topic "fmayle-flock-test" into main am: d093f03589

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

Change-Id: I73e7b60d3821407ad549203237e3d267626d181b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>