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

Change-Id: I9d40aa47a342f9a81cec9018a46ef4cc29730a4f