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

Change-Id: I4bf8fa04ad03d904f385ff8f1791651b7338043b