Merge "Add a method to note waking network packets to BatteryStats"