[automerger skipped] Merge "[Telephony Mainline] To implement new api for mvno matching" am: e7d29d4656 am: 0bea5c66d2 am: f49fcbb6ee -s ours
am skip reason: Change-Id I1466a2d47b5264d9ce67f8e15a17245edc7a72f3 with SHA-1 7157e9e502 is in history

Change-Id: Ib5c8a5fb5a3a46ae20752a4c0c20391fe4c9ec68