Merge "Fix IMS <-> CS redial scenarios for silent redial" into sc-dev am: 2c3c323f98

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

Change-Id: Idfb7b05d57816ecfdc000a2f8ecfcd9b3fcc10b9