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

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