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: d6548825 am: 048a661e

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



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