Merge changes from topic "vmnic_delete_tap" into main am: 03b3347b12 am: 5ce48566d9

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

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