Tele2 considered non-roaming on T-Mo

Change-Id: Ibb05f277b701861b8716168b54e96f63127e686d
Merge "Tele2 considered non-roaming on T-Mo" into cm-11.0
Merge remote branch 'cm/cm-11.0' into cm-11.0