[automerger skipped] Merge "CDMA MO SMS follow on DC feature" am: e1e4bf6d...
[automerger skipped] Merge "CDMA MO SMS follow on DC feature" am: e1e4bf6d am: 0e4577bd am: 3d1eb206 -s ours
am skip reason: Change-Id I7c7601fb42995f8a5cb27870bb5d131e217d8d4a with SHA-1 c250178a is in history
Change-Id: If4a2382d5d1e45b11caf9c51a7b9cc9cc872b678