[automerger skipped] Fix testTetheringUpstream flaky am: 994edc463e am: bd5240026c -s ours

am skip reason: Change-Id I6b433560fb27a3b4bd80c4198ccdb58a5be701b6 with SHA-1 47e3788e3e is in history

Change-Id: I60b59884a182847460af7d0c3f0571d5b054b1d7
tree: d7ebf0a36b4005ddea7dac442302bde91a2c6d00
  1. tests/