Merge "Fix race conditions between Tethering and TetherInterfaceStateMachine"