[automerger skipped] Moved MVNO matching logic out of old data stack am: a95dd62e am: 2a733748 -s ours am: 2e9573bd -s ours am: d739eb41 -s ours

am skip reason: Merged-In Ia7fc8042fe81a884bbab60c7a9bb6423f0401d65 with SHA-1 316939d2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107247



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