[automerger skipped] Merge changes from topic "expose-call-forward" am: 24c1cf113b am: de57e8e84c am: 9f13270180 am: dfbbbca926 -s ours

am skip reason: Change-Id I2d597d8a516a7b4f004ab8788392c4fc6aa5e4ed with SHA-1 940c4cab9a is in history

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

Change-Id: If2a14fa5191d7fcff534af323253f8355b4c227e