[automerger skipped] Merge "Cancel pending retry upon data profile unthrottle"...

[automerger skipped] Merge "Cancel pending retry upon data profile unthrottle" am: c7248db5 am: f4a4b3f3 am: 1f19daae am: 881cb606 am: e946e533 -s ours

am skip reason: Merged-In I0a66ef345e678ac3435f00bf1c94c0a17181b502 with SHA-1 4cf76bb3 is already in history

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



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