[automerger skipped] Merge "Fix failing to send SMS with SMSC over IMS" into...
[automerger skipped] Merge "Fix failing to send SMS with SMSC over IMS" into rvc-dev am: 96e5d0c0 -s ours am: ad86a62a -s ours
am skip reason: Change-Id If35709589e7ac303563ab25d4a56a7793d2e0910 with SHA-1 044afb93 is in history
Change-Id: If96335682a2d383a3568c8ae6fae04e4f93b98a8