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