Merge "make NUMERIC field null in case mcc/mnc is not defined" am: 198a7ea779 am: 12b2f569a6 am: 92011356af

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1853049

Change-Id: If2f56432fee53c35d33d068cfeb4aa05c5c8f9cb