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

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