Merge "Control ratcheting logic based on carrier config" into udc-qpr-dev am: b70e9811

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



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