[automerger skipped] Merge "[DataStallRecoveryManager] Fix the doRecovery...

[automerger skipped] Merge "[DataStallRecoveryManager] Fix the doRecovery logic when dial call" am: 29997cc0 am: 2d070120 am: 188d15d7 -s ours am: 1b4c2092 -s ours am: 554ee279 -s ours

am skip reason: Merged-In Ia117c2de0cd40d587cb14e2818d2a8a466ed4f25 with SHA-1 fc0df6ec is already in history

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

Change-Id: I25f79d082ff6dfdb6949ba1bba63f7d3abf098f8