am 5248b645: am a20e67c4: Merge "Adding subId in CdmaOptions to retrieve it in ApnSettings" into lmp-mr1-dev

* commit '5248b6452709d7fd255e4f6004b004752c51b311':
  Adding subId in CdmaOptions to retrieve it in ApnSettings