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

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



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