Merge "Merge "Cleanup DataStallRecoveryManager" into tm-dev am: 4851c90e am:...

Merge "Merge "Cleanup DataStallRecoveryManager" into tm-dev am: 4851c90e am: ef46f0c2 am: 083b0842" into tm-qpr-dev-plus-aosp am: 8b28defb

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



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