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

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

Change-Id: Ie609a3405f03948764ae55055ec6e29c4296870f