Update the call forwarding/waiting APIs am: a1acea2cbd am: 6bb6cbf257 am: 2b33a0d264

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1470911

Change-Id: I3cde7f8e1b510fdb60d7740021b88a1eeee7f999