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 am: d231caa6
Change-Id: I2c6ec4e953932db8ba826b7a9bb7a1d1b01e485a