Merge "Fix TetheringServiceTest#testTetheringManagerLeak flaky"