Merge "[Telephony Mainline] Add new api for Mvno matching"