Merge "CDMA MO SMS follow on DC feature"
am: 80da44e958

Change-Id: I133c60baf131a5d0762090334afd8449279794a6