Merge "Fix TetheringServiceTest#testTetheringManagerLeak flaky" am: c91fbabd45

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

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