[automerger skipped] Merge "Support Call Forwarding and Call Waiting APIs for voice call." am: 64c1e4ddef am: c2690c7050 am: c068e20b46 -s ours
am skip reason: Change-Id Iadeea607749c67209df8cb1313f8b134df0a5c4a with SHA-1 ce96e26c27 is in history

Change-Id: I66a33c610dbe523e7b573f5bbcafb64d7ff62cc3