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

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

Change-Id: I267053a4634f1b4a19f5b93d2a9ffe3e69ed8968