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: b24b5bb2 am: 8c7eb33d am: fc477902

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



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