[automerger skipped] Merge "[DSRM] Fix for failing to perform data stall...

[automerger skipped] Merge "[DSRM] Fix for failing to perform data stall recovery soon after        skipping data recovery action under poor network signal." am: c6cab386 am: 6798bff1 -s ours am: 87f5f40e -s ours

am skip reason: Merged-In I16abe882dfc965b7f48b37d79e5e678efbc490b0 with SHA-1 8fcf92c2 is already in history

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



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