Merge "Moved MVNO matching logic out of old data stack" am: c08189f5e6

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

Change-Id: I175dac484863334af5205cb7b9785004474cd315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>