[automerger skipped] Merge "CDMA MO SMS follow on DC feature" am: 80da44e958 am: 44eaabad25 am: c4c15e52fa -s ours
am skip reason: Change-Id I9aec3a58b531c17ec55db290d0e82bc7d34afa84 with SHA-1 ba2f83002d is in history

Change-Id: Ie75a7a1229b406580486149144048ea05ec7b1e0