Merge changes from topic "expose-call-forward" am: 24c1cf113b

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

Change-Id: Iaa61049311b3bb7a3cc97bc8b82de952bb807c48