Merge "[Telephony Mainline] To implement new api for mvno matching"
am: e7d29d4656

Change-Id: I0e1e6466b046bf0002211ffecea32a353ccd849f