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

Change-Id: I7cf4d05e88e92e7d5e7f374528edad64c559a09f