Merge "Change rcs carrier config" am: 0f6ef37312 am: a6428e5aa8

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1512631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4f4b01602986eef0d4b339aae2200015e7e5eb5