Merge "Revert "Rework CtsGpuProfilingDataTest"" into rvc-dev