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

Change-Id: I653dcb415ce03b73f9a172a8fe78b3a4be8feae2