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

Change-Id: Iebc30d204e378a63132157519a98034302535f44