Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" into android12-tests-dev