Merge "Merge "Add the individual wakeup alarm counts to the batterystats...

Merge "Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90 am: cad814b9" into nyc-mr1-dev-plus-aosp
am: df13127b

* commit 'df13127b':

Change-Id: Iec0d03efc8b9f3c2754133303ceacf2b719e1324