Merge pull request #39 from jkangas/master

Request for pulling functionality that enables usage of multiclient rilds to main branch
rilmodem/call-settings: cw set and query fix
Merge pull request #40 from jpoutiai/master

rilmodem/call-settings: cw set and query fix
[rilmodem][WIP] Fixing SIM application type recognizing in phonebook

Fixed merging bug with canonical version. Rilutil did not store the
SIM application type which lead to contacts importing failure.

Signed-off-by: Jussi Kangas <jussi.kangas@oss.tieto.com>