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

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1463230

Change-Id: I8019f7d7b830b99e864d2eb6b1143f39d6f4443f