am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev

* commit 'bd9b25efb8cdaa4772f730259418d66ba58beb40':
  BatteryStats: Record doze wake locks