[automerger skipped] Merge "Create new Carrier configuration for separate MMTEL/RCS features" am: 8283939cec am: 8d2ebed0cb am: 29c577d086 -s ours
am skip reason: Change-Id Ia16f82b9cfb9e873d2c26850dfbfd451638ad30c with SHA-1 6697814f96 is in history

Change-Id: Ie9d3d4088fadf63671b2fdd440e746a75c8b8557