Merge "Revert "Add FlickerServiceRule to splitscreen platinum tests"" into main