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
Change-Id: I73d07b5b9a1253f5378db31091c9659006caa75d
1 file changed