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

Change-Id: I3a1029d4dfc6f6e18d12b3f95bfa3d92ba096bae