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

Change-Id: I62330f033d38d58cbecc75b9daf6d0fac6f92933