Merge "Enable showing forwarded number" am: 1f6bed8801 am: 6a26c0a688

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie932c0fbe2c21cd3d182ed9dae70d3ab285ec75d