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

[automerger skipped] Merge "Ensure connection is unbound on call redirection timeout." into tm-dev am: d1d9f687 am: 4f98bc17 -s ours

am skip reason: Merged-In I76a65c3993f5107652f98bbe0283043ecff27a7c with SHA-1 7fe3a9cb is already in history

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



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