Merge changes from topic "CdmaSs"

* changes:
  callwaiting: Support CDMA call waiting
  callforwarding: Support CDMA call forwarding