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

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

Change-Id: Ia592f24d486074ab14b5d0c88c22db3e2a56bc51