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

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

Change-Id: Ia89d8d9802e05bc236388db67750d1fdf8918631