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

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



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