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

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



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