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

Change-Id: Ibcabdfb1dbf245c8148dec88a535713d9848425a