Merge "Cleanup before promoting SysUI tests to presubmit."