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