Vectone/Delight (MNC07) considered non-roaming on NOS (MNC03)

Change-Id: I743935b94bb531d78b784550e3028378cdc01959
Lycamobile (MNC04) considered non-roaming on Vodafone (MNC01)

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