Merge "Fix testTtffWithNetwork timeout issue" into android12L-tests-dev