Merge "IMS: Add new carrier config." am: 942b71b485

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c25528234d5a822f60dc853ce3131a6b946e9db