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

Change-Id: Ib29c2c24c39bcc7de50d550792b36aebbd537739