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

Change-Id: I26ebe502a9e70f039e663fcd00fa772d8a8726b3