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

Change-Id: Ib91c6ec0e4dd9a93d41bb98ca0b8dac1981d68b9