Merge "Add clean up to SysuiBaseFragmentTest"