Fix ofono reconnection issues

This merge request aims to upstream two patches by Canonical that has been carried around by UBports for ofono support.

See relevant links/discussion here.

I tested this in combination of ofono 1.31, EG25-G modem and NetworkManager from git master and with this, re-connection issues I was having stopped happening.

Merge request reports