Lycamobile (MNC04) considered non-roaming on Vodafone (MNC01)

Change-Id: Icff916672e5ed666adf2cdfeb26d24bf43b64683
Merge "Lycamobile (MNC04) considered non-roaming on Vodafone (MNC01)" into kk4.4