Merge "PM / Sleep: Change wakeup source statistics to follow Android"