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: fa64d127

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



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