Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'"