[automerger skipped] Merge changes from topic "refactor_data_stall" am:...

[automerger skipped] Merge changes from topic "refactor_data_stall" am: d70881f9 am: 9809e272 am: d6796329 -s ours am: 0f2edfb0 -s ours

am skip reason: Merged-In I2c9fd7f4610db67304fe779ab51001ca82607ced with SHA-1 b0e73da3 is already in history

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

Change-Id: I155d999406b4f4343129ea10d8dab68107e5c428