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

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