Merge "Revert "Properly notify batterystats when packages change idleness.""