[automerger skipped] DataRetryManager don't remove unthrottled entries on...

[automerger skipped] DataRetryManager don't remove unthrottled entries on cleanup am: 62d0426a am: e29ded20 -s ours am: 7945cd16 -s ours

am skip reason: Merged-In I35fa1c762a3e97f0bfb4a9ce84aa13578557ac91 with SHA-1 99f42c2a is already in history

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



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