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: I7a6f8576e7ae4f1126aab9f83f3f7c99c93c0e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>