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

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

Change-Id: Ica06edfd2845f0491afe2d1c17f507ef5b633458