Merge "Revert "Add ALTECOM and FIBRACAT MVNO settings""
am: 1b40b1e341

Change-Id: I4f56de76fb92dcd0ab674343a26c5b3a3d500e9e