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

* commit '7eaa420a2c463bcec7a4a14b63b1a7eaab67a56a':
  Add subId as parameter for get/setDataEnabled.