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

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

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