am d9b729c7: am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit 'd9b729c7c5ab7f9f348edc61ddec41fb54ba5730':
  Charge apps for wifi tx time while scanning