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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb1ebd2b54880a61c38f80c8027c8777958dbf7a