Merge "ServiceManager: Check guaranteeClient before unregistering services"