Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev