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

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

Change-Id: Ib8a8cbe2275fd2ca7d5464247e361b2cc98b2819