am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev

* commit 'adaa79d722dc1b410a3a8b083be5268cbb817ce4':
  Remove flag mDataInjectionMode.