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

Change-Id: Ic288f518d10efc6f2173327156e620fea2c1f90f