[automerger skipped] Fix testTetheringUpstream flaky am: 994edc463e -s ours
am skip reason: Change-Id I6b433560fb27a3b4bd80c4198ccdb58a5be701b6 with SHA-1 47e3788e3e is in history
Change-Id: I337aa2a6304f7af1502ffd96f476895fab5111bc
This commit is contained in: