Merge "DO NOT MERGE: Stabilize testConcurrentServerSocketCloseReliablyThrows." into nougat-mr1-cts-dev
am: 00a16ee49d  -s ours

Change-Id: I29a4b788bf41e33afad66356fa64bf2b706e392c