Moved MVNO matching logic out of old data stack

Moved MVNO matching logic out of old data stack. There
is no logic change here.

Bug: 171809764
Test: Manual
Merged-In: Ia7fc8042fe81a884bbab60c7a9bb6423f0401d65
Change-Id: Ia7fc8042fe81a884bbab60c7a9bb6423f0401d65
3 files changed