Merge "Fix TetheringTest.failureEnablingIpForwarding verification count" into main am: 856f57a0ce

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

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