Merge "ServiceManager: Check guaranteeClient before unregistering services" into rvc-dev am: edbc86de05 am: cf8bd7a92e

Change-Id: If20dcf4afa599bb923aa7b4751f7c461700d4ba0