am 4294e0bf: am 760ed4bf: am 7eaa420a: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '4294e0bfd1bc3b03a38da5d94e62478e9f1b15cb':
  Add subId as parameter for get/setDataEnabled.