Merge "Increase CtsNetTestCases shell timeout to 25 minutes" into main