am ec185f4f: Merge "Revert "Add missing unregistrations when a connection ends."" into mnc-dev

* commit 'ec185f4fe3f2222444366ee2005b6c2bd90f0880':
  Revert "Add missing unregistrations when a connection ends."