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
Change-Id: I78a6a5a7d6726db531b72ce7cfc713da600bc256