Merge "Remove unused testutils lib from tethering tests" into android11-tests-dev