Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 1f17c75beb am: 514a9e40d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393116

Change-Id: I7a4a90761deea319355c7900ae8e78777455924c