[automerger skipped] Merge "Moved MVNO matching logic out of old data stack" am: c08189f5e6 am: d7cfea4609 -s ours

am skip reason: Merged-In I73d07b5b9a1253f5378db31091c9659006caa75d with SHA-1 8b766fcaea is already in history

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

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