[automerger skipped] Update the call forwarding/waiting APIs am: a1acea2cbd am: 6bb6cbf257 am: 2b33a0d264 am: 3541c0e5e6 -s ours

am skip reason: Change-Id Id05a2e10454493866a2889945fb490f000cc9c41 with SHA-1 27d24263ba is in history

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

Change-Id: Ib0e0bdd1ea008c175f214785d8f7342bdfbacb1b