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

Change-Id: Ibef74c641596dc57d8a525316ba95ff35e07fce2