Merge "Reset radio service proxy after Mock modem detach" into tm-dev am: af3d911f am: 97e5bbc1

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



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