Merge "Support call waiting/call swap on single phone."
am: b143b49138

Change-Id: Iefb15fe29ddf3859ae50660ed668c93f5a1d93d2