[automerger skipped] Merge "CDMA MO SMS follow on DC feature" am: 8449733719 am: 10e016459e am: b209a3b773 -s ours
am skip reason: Change-Id I4fbcaa13648c66482f6bb741c433aede2ec824c7 with SHA-1 bf5aeaa3b3 is in history

Change-Id: I733bd17e4897016bbc3f851294522642663be477