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: 9d739640 am: cf2e23ce

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



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