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

Change-Id: I5be733e8edf4a07840b1d87ab295be606fbbadbb