am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '15b29ac7faf3b8b7845e6623f68ae7a7391dab78':
  Add subId as parameter for get/setDataEnabled.