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