Merge "Mcc and mnc from xml in RRO may be integers" am: 17fb5eb988 am: ff0a75250a am: 427916c812

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17e9ec3ce0f8f7b84dd9f41ffe42b5a0726f6002