telephony: merge ics call waiting tweaks

These tweaks are already in ics and other android repo's, eg. android-x86.

Change-Id: I754ea6034a589d54d26818240361d90975955bc0
Signed-off-by: Spencer Oliver <spenoliver@gmail.com>