Merge "[Telephony Mainline] Add new api for Mvno matching"
am: 2d83e92bbd

Change-Id: I8a688133c3c7c1c5e7a8a984fa49e3ad273ad2e0