Merge "Revert "Move tests/systemui/s* to multivalentTests"" into main