Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: 2e59c22326

Change-Id: I7c0b5c70ecb91a9bc640c989b8fa782dc441fbbd