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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c711995bff52791a62368d2afc9e6b6f0ae638c