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

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

Change-Id: I5c6b7898864fe125c9a274be800ad237d6e42738