Merge "Cleanup existing firewall rule on myUid before the test" into main am: 18520551db am: bbf74da2b5 am: 0a9f8df15b

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

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