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

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