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

Change-Id: I03f649b87c1e6bb51d2063d04f252d6cacc611e6