Merge "Support call waiting/call swap on single phone." into oc-mr1-dev