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