[automerger skipped] Merge "Only reset throttling when carrier config is on"...

[automerger skipped] Merge "Only reset throttling when carrier config is on" am: bb8c738f am: 4c0a597a -s ours am: f0a404ec -s ours am: 5c535362 -s ours am: a23be28d -s ours

am skip reason: Merged-In Ie884e0faa71cf9f3e125a572e67e3003c750a47b with SHA-1 5adf561a is already in history

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



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