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: ad8a3cbf am: d6a572c8
Change-Id: Ia6f693ab3d81d354755640e8c86f653bc0d8b97c