Merge "Moved MVNO matching logic out of old data stack" into tm-dev am: 49ccf5091d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17294757

Change-Id: Ia4eb0b25368b0b4feda86dd94efa943e41c9b189