[automerger skipped] Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8fe8 am: 086476e72e
am: 5d82f62bdb  -s ours

Change-Id: Ia1a07a2b9773fd378ddf41adbefd1c35d05ddb86