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: 58f5a324 am: 14737781
Change-Id: Ic71c7c298935f020eb9e277e3a39f157e4b2ffb5