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: fe9b2ba6 am: 4774261c am: dba1e897

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



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