[automerger skipped] Merge "[Telephony Mainline] Add new api for Mvno matching" am: 2d83e92bbd am: dc4bd96c79 am: dea27d3676 -s ours
am skip reason: Change-Id I550e93ab8662c81068a6d52fef2e3c299607c18f with SHA-1 af15476935 is in history

Change-Id: I441b35cc9fed8322716c4d4c0ddc298ea8dacfb1