Merge "Integrate Call Forwarding / Waiting function in Telephony" am: ababb32185

Change-Id: Idcb2b24aab0ce39a5db05ec212dd671a8862c907