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

Change-Id: Ib876abba381b698f921111af97477f24f1fa4349