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

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

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



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