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

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