Merge "Parsing mcc and mnc as integers when null does not work" am: efbeef6438 am: 96eee697d6 am: 3f230dc402

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

Change-Id: I755caafc80ba53ea54f9c68627fe4fbba1f43acc