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

Change-Id: Ide13ffab022dc403d34c64bf97ed31537e33816b