Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505
am: 9a13cc6992

* commit '9a13cc69926c90fe75b624a9a781dc56706a6091':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot