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

Change-Id: I8099c77dc4b21fabd1f1a7b8acc920a4b368de21