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

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

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



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