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

Change-Id: I01e5afdceb3f138c3055b817d5f9a4c41909990c