Merge "Use the two digital number pattern from carrier config instead." into...
Merge "Use the two digital number pattern from carrier config instead." into rvc-dev am: 1591e841 am: 4646513f am: db0a7c27 am: 32f1b0b7 am: 2afcc336
Change-Id: I27a32ecac7892edf460b9acc00cb080aa8f701e3