Moved MVNO matching logic out of old data stack am: a95dd62e

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



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