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

Change-Id: Ibd116f5a8dad884f7366839af5ebc2095d43cc7a