Merge "DataRetryManager don't remove unthrottled entries on cleanup" into...

Merge "DataRetryManager don't remove unthrottled entries on cleanup" into tm-dev am: 551c254f am: e9180878 am: 40ef9927 am: 5bac7b71

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



Change-Id: I0ed98c97db098f1e7416c0db78e926bbcbdc27fe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>