[automerger skipped] Merge "Moved MVNO matching logic out of old data stack"...

[automerger skipped] Merge "Moved MVNO matching logic out of old data stack" am: 91b20a2f am: 65ec80c8 -s ours am: 44a13017 -s ours am: f89e36db -s ours am: 6d47d47a -s ours

am skip reason: Merged-In I874c64e9a5e7a55bb92666f8fb528f26195b89f6 with SHA-1 a2751655 is already in history

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



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