[automerger skipped] Merge "Ensure connection is unbound on call redirection...

[automerger skipped] Merge "Ensure connection is unbound on call redirection timeout." into sc-qpr1-dev am: d13f45d7 am: 37b5ce25 -s ours am: 366b7b6b -s ours am: 4de957d1 -s ours am: 35307f15 -s ours

am skip reason: skipped by grantmenke

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



Change-Id: I36dd3029a377eb12d6fee2bec376fd8f321df309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>