Merge "Remove SocketUtils#setSocketTimeValueOption" into qt-dev
am: 28fd318974

Change-Id: Ifd5a6190001c9242bdf98173217a176eb22559dc