Merge "Re-enable WifiBatteryStats and CellularBatteryStats" into main