Reorder add/remove/register/unregister carrier listeners

Helper methods in the middle of the class make it harder
and more confusing. This patch moves the helpers out of
the way and regroups the useful methods in a more logical
order.

Test: FrameworkNetTests
Change-Id: I386ef7140c0535c9817a663910c19afeaf70981b