[automerger skipped] Merge "Unregister callback on data network disconnect"...

[automerger skipped] Merge "Unregister callback on data network disconnect" into tm-qpr-dev am: ede5d6ad am: 397554ce -s ours

am skip reason: Merged-In Ie37c67f462c122e32eaff4563c5aed5cc4aa6f3b with SHA-1 b709ee9d is already in history

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



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