Merge "Add NetworkTypeBitmask into public ApnSetting." am: 278dd4ab90 am: 97104cb905
am: aa32802268

Change-Id: Iab92157d82b1aa399aa06e77abdcf22d71f9f3b9