Merge "Add APNs for some MNO and MVNO"
am: 37c4fde43a

Change-Id: Ibd6a15726b62353f10733f2f901381ac48d16f88