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

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

Change-Id: I6538b619e23ee5119adf699b1f30d1455b2a2a5a