Merge "[Telephony Mainline] To use the new api isMvnoMatched for mainline"