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

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



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