Merge "Fix flaky test BinderTest.TetherGetStats"