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

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



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