[automerger skipped] Merge "[Telephony Mainline] To use the new api isMvnoMatched for mainline" am: 53c68f03ee am: 02a63705d8 am: 98db408a9d -s ours
am skip reason: Change-Id Id4900bee21af992ba55152b8b715a57fc45cca57 with SHA-1 a98edab7de is in history

Change-Id: I76a696baf28d2bb1f6696322ddab78956adc8d22