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

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

Change-Id: I809f2344b70f372fdc10b792a56c0d7f15b861b4