Merge "Add a carrier config for two digital number pattern" into rvc-dev am: 5dd0e09694 am: fe86067888 am: d05b84dd14

Change-Id: I4be9497d2418b7a1850cff9a94ce3699783bb9c2