[automerger skipped] Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 17c583fbce am: 759853ba37 am: 4741ad7efa am: bd8a460d04 am: fb54143f50 -s ours

am skip reason: Change-Id I6cd1e60e0dbb634581c97552dad244383ff4e3f9 with SHA-1 ab6d62ae92 is in history

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

Change-Id: I018d9e87ca580c583bf879ff87972313ee9aeee7