Merge "[automerger skipped] Merge "Support losing the upstream in...

Merge "[automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b am: 4167b495 -s ours am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 fe9b61da is in history" into rvc-d1-dev-plus-aosp am: 716185e1 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 fe9b61da is in history

Change-Id: Ib7f2d74af78eb524df366db33dc53d81c073b1a2