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

* commit '8bed1a40ad931d2e418289435942bca01f328dea':
  Adding subId in CdmaOptions to retrieve it in ApnSettings