[automerger skipped] Merge "Update NetworkRegistrationManager with new...

[automerger skipped] Merge "Update NetworkRegistrationManager with new CarrierConfigManager APIs" into main am: d7657b33 am: 76306d6b -s ours am: 04ba65c5 -s ours

am skip reason: Merged-In I39a11d3e08379d1a7fd512b5f5648a9699f862ef with SHA-1 8e4c65ee is already in history

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



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