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

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



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