Merge "Skip teardown if handover is no longer needed" into tm-qpr-dev am: 0611a83a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20307161



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