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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ba7e61f7df405c57c07fb149f2a603171f9a5b6