[automerger skipped] Merge "Integrate Call Forwarding / Waiting function in Telephony" am: ababb32185 am: 88973e00fc am: 5bdbaa702a -s ours
am skip reason: Change-Id I56243d4344ca3bc21ddf8269c957cf8bbba0cb03 with SHA-1 4a59405242 is in history

Change-Id: Idfc3bb04b48646f836e8c2816ca25b129e337348