[automerger skipped] Add Data Stall Recovery Mechanism am: 34028715 am:...

[automerger skipped] Add Data Stall Recovery Mechanism am: 34028715 am: 53fb0259 am: e3351e47 -s ours am: bf31ea42 -s ours

am skip reason: Merged-In I92a148e5e065af08883bee1c6d570fb9521bfb24 with SHA-1 3bad1fd2 is already in history

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

Change-Id: Id3a5b452e3df9431ec2f5f9272ca1c7a23bece07