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 am: 4191f219

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



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