Merge "Create new Carrier configuration for separate MMTEL/RCS features" am: 8283939cec am: 8d2ebed0cb

Change-Id: I71829e3233215ca50030780718bb67fc0936ea6d