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: I1f0eeab9f6e3aa7b5995d59c4f60b46e426af530