Merge "Support Call Forwarding and Call Waiting APIs for voice call." am: 64c1e4ddef am: c2690c7050

Change-Id: I48d9b60cffb7645dfc9ed284e3a99eb7d13d1b8b