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

Change-Id: I9b0e7c3c76a33526bd90730b1f775e29134d909e