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

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2107019



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