Merge "Unregister network scan before deleting" into udc-dev am: 5c7a358d am: 167969b0

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



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