Merge "ServiceManager: Check guaranteeClient before unregistering services" into rvc-dev am: edbc86de05 am: 29e0fc6700 am: 49196b30e2 am: 8dc9754683 am: cdaaac86ab

Change-Id: I2dd571f26961996be8a710cd17f95f0d13c2ddd5