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

Change-Id: Id29a2d7c06f760cca22f64776487aae19c1bd678