Merge "[automerger skipped] Merge "Remove unused testutils lib from tethering tests" into android11-tests-dev am: 2a7f86bbb6 -s ours" into android12-tests-dev