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

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