Merge changes from topic "fix_ims_cs_redial" into sc-dev am: e11d07ac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15352250

Change-Id: I510b8b6bb843620f0600e10678126c1a0a8232a9