[automerger skipped] Tidy OldSocketTest.test_connectLjava_net_SocketAddressI_setSOTimeout. am: fa482ede6c am: 807374464b -s ours am: 50858c82c8 am: 9ff01704ec am: c3f676f04c

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/10953438

Change-Id: Ib5ffb7d810a75be603ddacc6ff70c1bba0311ca1