backport fixes to make the modem remember the settings#255

mzanetti wants to merge 2 commits intorilmodem:masterrilmodem/ofono:masterfrom

mzanetti:mastermzanetti/ofono:masterCopy head branch name to clipboard