Move reusable two-part tariff billing services

https://eaflood.atlassian.net/browse/WATER-4201

> Part of the work to support two-part tariff supplementary bill runs

In [Move reusable supplementary billing services](#1760) we shifted some existing supplementary billing services to make them resuable by the two-part tariff supplementary billing engine we're building.

Our [spike](#1412) has shown there are some two-part tariff annual billing services we can also make reusable.