Merge "Fixes --net tap-fd=... format to pass a numeric i32 file descriptor" into main am: 1ad488412e

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

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