Merge "ServiceManager: Check guaranteeClient before unregistering services" am: cbe953924c am: 76eb4acf8a

Change-Id: I0b80ce90ba9441335387673fbcddd9f9772f5fa3