Merge "[Telephony Mainline] To use the new api isMvnoMatched for mainline"
am: 53c68f03ee

Change-Id: Id81d9fe047333727aaedd24b05aa7f7b2fc992f1