Merge "Only reset throttling when carrier config is on" into tm-dev am:...

Merge "Only reset throttling when carrier config is on" into tm-dev am: 20f1a78c am: 281b4862 am: 08c9b09a

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



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