am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev

* commit '32ddd5346672339fe225ad16224a4498fef65ac3':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps