Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8fe8
am: 086476e72e

Change-Id: I12868c85b5645b84097566a936d7692ddb6fdcb7