[automerger skipped] Changed the way carrier config changes am: be7a1fef am:...

[automerger skipped] Changed the way carrier config changes am: be7a1fef am: d5be95ab am: 2f7d935e am: a6b5e3fc -s ours

am skip reason: Merged-In I1e122c64450d5b504cfaa93197439182c21e0956 with SHA-1 85ec4696 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1949736

Change-Id: I25badde08a8fc9ce0ae1c2651184a64bcfb951d3