Merge "Add the individual wakeup alarm counts to the batterystats checkin."...
Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90
am: 67af8a12
* commit '67af8a12':
Add the individual wakeup alarm counts to the batterystats checkin.
Change-Id: Ia87d4db58bbdf4695b280edf6b6a79ad5425eea7