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

* commit '760ed4bfb4bbc6ab9aacd7329048bb8749c4340b':
  Add subId as parameter for get/setDataEnabled.