Merge "Unregister callback on data network disconnect" into tm-qpr-dev am: ede5d6ad

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



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