am b32887b5: am f3f3c1b0: Merge "Pass subId on intent back to call settings." into lmp-mr1-dev

* commit 'b32887b5c5a82be92e9eede06366fce57f169b12':
  Pass subId on intent back to call settings.