[automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 03a734f352 is in history

Change-Id: I4946d69633eb2e00ca9fa566f6b85fc82f071665
tree: f0303c7cdfbe9b9bdd3edf0b2aa188014a2af33b
  1. Tethering/