Merge "FrameTraceTest: Account for extra perfetto trace packet" into main