Vectone UK (MNC01) considered non-roaming on T-Mobile (MNC30)

Change-Id: Id74c854f958be721be12451a124cfd2f8b150255
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0