[automerger skipped] Merge "Update RatRatcheter with new CarrierConfigManager...

[automerger skipped] Merge "Update RatRatcheter with new CarrierConfigManager APIs" into main am: 63c7552a am: e73b5c7e -s ours am: aefb9d27 -s ours am: e03f1a15 -s ours

am skip reason: Merged-In I1c07e553692ae94a32199cdd052aac24cfa05d75 with SHA-1 9eb55811 is already in history

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



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