Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev