Merge "Presubmit com.android.wm.shell.onehanded test flaky"