Merge "Merge "Remove SocketUtils#setSocketTimeValueOption" am: 7fdf4e95 am: 2e74de0a" into qt-dev-plus-aosp