Merge "NR SA disabling for Wifi call HO" into udc-dev am: b9c4dbbb

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



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