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

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

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



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