Merge "adb: fix timeout-related test flakiness."